From a32ec0c45a73e1d03e3e79203aa808803b00ba5c Mon Sep 17 00:00:00 2001
From: Justin Burkett <justin@burkett.cc>
Date: Mon, 28 Nov 2016 10:10:18 -0500
Subject: [PATCH] Simplify --format-and-replace

---
 which-key.el | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/which-key.el b/which-key.el
index 6828f42fe2d..9acb29bb2d4 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1445,26 +1445,26 @@ faces and perform replacements according to the three replacement
 alists. Returns a list (key separator description)."
   (let ((sep-w-face
          (propertize which-key-separator 'face 'which-key-separator-face))
-        (local-map (current-local-map)))
-    (delq
-     nil
-     (mapcar
-      (lambda (key-binding)
-        (let* ((key (car key-binding))
-               (orig-desc (cdr key-binding))
-               (group (which-key--group-p orig-desc))
-               (keys (which-key--current-key-string key))
-               (local (eq (which-key--safe-lookup-key local-map (kbd keys))
-                          (intern orig-desc)))
-               (hl-face (which-key--highlight-face orig-desc))
-               (key-binding (which-key--maybe-replace (cons keys orig-desc))))
-          (when (consp key-binding)
-            (list (which-key--propertize-key
-                   (car (last (split-string (car key-binding) " "))))
-                  sep-w-face
-                  (which-key--propertize-description
-                   (cdr key-binding) group local hl-face orig-desc)))))
-      unformatted))))
+        (local-map (current-local-map))
+        new-list)
+    (dolist (key-binding unformatted)
+      (let* ((key (car key-binding))
+             (orig-desc (cdr key-binding))
+             (group (which-key--group-p orig-desc))
+             (keys (which-key--current-key-string key))
+             (local (eq (which-key--safe-lookup-key local-map (kbd keys))
+                        (intern orig-desc)))
+             (hl-face (which-key--highlight-face orig-desc))
+             (key-binding (which-key--maybe-replace (cons keys orig-desc))))
+        (when (consp key-binding)
+          (push
+           (list (which-key--propertize-key
+                  (car (last (split-string (car key-binding) " "))))
+                 sep-w-face
+                 (which-key--propertize-description
+                  (cdr key-binding) group local hl-face orig-desc))
+           new-list))))
+    (nreverse new-list)))
 
 (defun which-key--get-keymap-bindings (keymap &optional filter)
   "Retrieve top-level bindings from KEYMAP."
-- 
2.30.2